(comint-postoutput-scroll-to-bottom): Cope with unset

comint-last-output-start marker.

diff --git a/lisp/comint.el b/lisp/comint.el
index d38761506de0715e5fe009c32e2246b8c554adea..42c2fb8830815fcea6f7e0d711041db1c52dc012 100644 (file)
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -1422,7 +1422,8 @@ This function should be in the list `comint-output-filter-functions'."
                                  (and (eq scroll 'this) (eq selected window))
                                  (and (eq scroll 'others) (not (eq selected window)))
                                  ;; If point was at the end, keep it at end.
-                                 (>= (point) comint-last-output-start)))
+                                  (and (marker-position comint-last-output-start)
+                                       (>= (point) comint-last-output-start))))
                         (goto-char (process-mark process)))
                     ;; Optionally scroll so that the text
                     ;; ends at the bottom of the window.